From 9033336a2347fe74687cce4912a98cac98105bf6 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 2 Oct 2020 22:28:17 -0400 Subject: [PATCH] css: Move _gtk_css_print_string around Move this to a separate header, since it is not parser functionality, and kill the duplicate gtkcssparserprivate.h header. --- gsk/gskrendernodeparser.c | 1 + gtk/css/gtkcssparserprivate.h | 3 --- .../gtkcssserializer.c} | 6 +++-- .../gtkcssserializerprivate.h} | 26 ++++++++++++------- gtk/css/meson.build | 1 + gtk/gtkcssarrayvalueprivate.h | 4 ++- gtk/gtkcssbgsizevalueprivate.h | 4 ++- gtk/gtkcssbordervalueprivate.h | 4 ++- gtk/gtkcsscolorvalueprivate.h | 4 ++- gtk/gtkcsscornervalueprivate.h | 4 ++- gtk/gtkcsseasevalueprivate.h | 4 ++- gtk/gtkcssenumvalueprivate.h | 4 ++- gtk/gtkcssfiltervalueprivate.h | 4 ++- gtk/gtkcssfontfeaturesvalue.c | 4 ++- gtk/gtkcssfontfeaturesvalueprivate.h | 4 ++- gtk/gtkcssfontvariationsvalue.c | 4 ++- gtk/gtkcssfontvariationsvalueprivate.h | 4 ++- gtk/gtkcssimageicontheme.c | 1 + gtk/gtkcssimageprivate.h | 4 ++- gtk/gtkcsskeyframesprivate.h | 4 ++- gtk/gtkcssnumbervalueprivate.h | 4 ++- gtk/gtkcsspalettevalueprivate.h | 4 ++- gtk/gtkcsspositionvalueprivate.h | 4 ++- gtk/gtkcssprovider.c | 4 ++- gtk/gtkcssrepeatvalueprivate.h | 4 ++- gtk/gtkcssselectorprivate.h | 4 ++- gtk/gtkcssshadowvalueprivate.h | 4 ++- gtk/gtkcssshorthandpropertyprivate.h | 4 ++- gtk/gtkcssstringvalue.c | 1 + gtk/gtkcssstringvalueprivate.h | 4 ++- gtk/gtkcssstylepropertyimpl.c | 4 ++- gtk/gtkcsstransformvalueprivate.h | 4 ++- gtk/gtkstyleproperty.c | 4 ++- gtk/gtkstylepropertyprivate.h | 4 ++- gtk/meson.build | 1 - 35 files changed, 105 insertions(+), 43 deletions(-) rename gtk/{gtkcssparser.c => css/gtkcssserializer.c} (93%) rename gtk/{gtkcssparserprivate.h => css/gtkcssserializerprivate.h} (59%) diff --git a/gsk/gskrendernodeparser.c b/gsk/gskrendernodeparser.c index 667a68f8a9..06d1bdb4d2 100644 --- a/gsk/gskrendernodeparser.c +++ b/gsk/gskrendernodeparser.c @@ -32,6 +32,7 @@ #include #include "gtk/css/gtkcssdataurlprivate.h" #include "gtk/css/gtkcssparserprivate.h" +#include "gtk/css/gtkcssserializerprivate.h" #ifdef CAIRO_HAS_SCRIPT_SURFACE #include diff --git a/gtk/css/gtkcssparserprivate.h b/gtk/css/gtkcssparserprivate.h index 9239477020..349ad67999 100644 --- a/gtk/css/gtkcssparserprivate.h +++ b/gtk/css/gtkcssparserprivate.h @@ -151,9 +151,6 @@ gsize gtk_css_parser_consume_any (GtkCssParser gsize n_options, gpointer user_data); - -void _gtk_css_print_string (GString *str, - const char *string); G_END_DECLS #endif /* __GTK_CSS_PARSER_H__ */ diff --git a/gtk/gtkcssparser.c b/gtk/css/gtkcssserializer.c similarity index 93% rename from gtk/gtkcssparser.c rename to gtk/css/gtkcssserializer.c index bb5b0a8c4a..838a7fb3f4 100644 --- a/gtk/gtkcssparser.c +++ b/gtk/css/gtkcssserializer.c @@ -17,8 +17,11 @@ #include "config.h" -#include "gtkcssparserprivate.h" +#include "gtkcssserializerprivate.h" +/* Escape a string so that it can be parsed + * as a css string again. + */ void _gtk_css_print_string (GString *str, const char *string) @@ -63,4 +66,3 @@ _gtk_css_print_string (GString *str, out: g_string_append_c (str, '"'); } - diff --git a/gtk/gtkcssparserprivate.h b/gtk/css/gtkcssserializerprivate.h similarity index 59% rename from gtk/gtkcssparserprivate.h rename to gtk/css/gtkcssserializerprivate.h index 68fa8a18d2..2d1a16949f 100644 --- a/gtk/gtkcssparserprivate.h +++ b/gtk/css/gtkcssserializerprivate.h @@ -1,10 +1,10 @@ -/* GTK - The GIMP Toolkit - * Copyright (C) 2011 Benjamin Otte +/* + * Copyright © 2020 Red Hat, Inc * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -13,15 +13,21 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . + * + * Authors: Matthias Clasen */ -#ifndef __GTK_CSS_PARSER_PRIVATE_H__ -#define __GTK_CSS_PARSER_PRIVATE_H__ -#include +#ifndef __GTK_CSS_SERIALIZER_H__ +#define __GTK_CSS_SERIALIZER_H__ + +#include + +G_BEGIN_DECLS + +void _gtk_css_print_string (GString *str, + const char *string); -#include -#include "gtk/css/gtkcsstokenizerprivate.h" -#include "gtk/css/gtkcssparserprivate.h" +G_END_DECLS -#endif /* __GTK_CSS_PARSER_PRIVATE_H__ */ +#endif /* __GTK_CSS_SERIALIZER_H__ */ diff --git a/gtk/css/meson.build b/gtk/css/meson.build index 00284baf36..6b24561928 100644 --- a/gtk/css/meson.build +++ b/gtk/css/meson.build @@ -8,6 +8,7 @@ gtk_css_private_sources = files([ 'gtkcssdataurl.c', 'gtkcssparser.c', 'gtkcsstokenizer.c', + 'gtkcssserializer.c', ]) gtk_css_public_headers = files([ diff --git a/gtk/gtkcssarrayvalueprivate.h b/gtk/gtkcssarrayvalueprivate.h index fb9fb376c0..1f9f38b006 100644 --- a/gtk/gtkcssarrayvalueprivate.h +++ b/gtk/gtkcssarrayvalueprivate.h @@ -20,7 +20,9 @@ #ifndef __GTK_CSS_ARRAY_VALUE_PRIVATE_H__ #define __GTK_CSS_ARRAY_VALUE_PRIVATE_H__ -#include "gtkcssparserprivate.h" +#include +#include "gtk/css/gtkcsstokenizerprivate.h" +#include "gtk/css/gtkcssparserprivate.h" #include "gtkcssvalueprivate.h" #include "gtktypes.h" diff --git a/gtk/gtkcssbgsizevalueprivate.h b/gtk/gtkcssbgsizevalueprivate.h index 5f31ff2208..47e356ead6 100644 --- a/gtk/gtkcssbgsizevalueprivate.h +++ b/gtk/gtkcssbgsizevalueprivate.h @@ -20,7 +20,9 @@ #ifndef __GTK_CSS_BG_SIZE_VALUE_PRIVATE_H__ #define __GTK_CSS_BG_SIZE_VALUE_PRIVATE_H__ -#include "gtkcssparserprivate.h" +#include +#include "gtk/css/gtkcsstokenizerprivate.h" +#include "gtk/css/gtkcssparserprivate.h" #include "gtkcssimageprivate.h" #include "gtkcssvalueprivate.h" diff --git a/gtk/gtkcssbordervalueprivate.h b/gtk/gtkcssbordervalueprivate.h index fe49904002..0fcaaf7db7 100644 --- a/gtk/gtkcssbordervalueprivate.h +++ b/gtk/gtkcssbordervalueprivate.h @@ -20,7 +20,9 @@ #ifndef __GTK_CSS_BORDER_VALUE_PRIVATE_H__ #define __GTK_CSS_BORDER_VALUE_PRIVATE_H__ -#include "gtkcssparserprivate.h" +#include +#include "gtk/css/gtkcsstokenizerprivate.h" +#include "gtk/css/gtkcssparserprivate.h" #include "gtkcssnumbervalueprivate.h" #include "gtkcssvalueprivate.h" diff --git a/gtk/gtkcsscolorvalueprivate.h b/gtk/gtkcsscolorvalueprivate.h index 49387d2c43..f96f6f4234 100644 --- a/gtk/gtkcsscolorvalueprivate.h +++ b/gtk/gtkcsscolorvalueprivate.h @@ -18,7 +18,9 @@ #ifndef __GTK_CSS_COLOR_VALUE_PRIVATE_H__ #define __GTK_CSS_COLOR_VALUE_PRIVATE_H__ -#include "gtkcssparserprivate.h" +#include +#include "gtk/css/gtkcsstokenizerprivate.h" +#include "gtk/css/gtkcssparserprivate.h" #include "gtkcssvalueprivate.h" G_BEGIN_DECLS diff --git a/gtk/gtkcsscornervalueprivate.h b/gtk/gtkcsscornervalueprivate.h index 59451a7840..a364ce9df5 100644 --- a/gtk/gtkcsscornervalueprivate.h +++ b/gtk/gtkcsscornervalueprivate.h @@ -20,7 +20,9 @@ #ifndef __GTK_CSS_CORNER_VALUE_PRIVATE_H__ #define __GTK_CSS_CORNER_VALUE_PRIVATE_H__ -#include "gtkcssparserprivate.h" +#include +#include "gtk/css/gtkcsstokenizerprivate.h" +#include "gtk/css/gtkcssparserprivate.h" #include "gtkcssvalueprivate.h" G_BEGIN_DECLS diff --git a/gtk/gtkcsseasevalueprivate.h b/gtk/gtkcsseasevalueprivate.h index 6b4dab3717..8aa2770fee 100644 --- a/gtk/gtkcsseasevalueprivate.h +++ b/gtk/gtkcsseasevalueprivate.h @@ -20,7 +20,9 @@ #ifndef __GTK_CSS_EASE_VALUE_PRIVATE_H__ #define __GTK_CSS_EASE_VALUE_PRIVATE_H__ -#include "gtkcssparserprivate.h" +#include +#include "gtk/css/gtkcsstokenizerprivate.h" +#include "gtk/css/gtkcssparserprivate.h" #include "gtkcssvalueprivate.h" G_BEGIN_DECLS diff --git a/gtk/gtkcssenumvalueprivate.h b/gtk/gtkcssenumvalueprivate.h index 22bab5f1f4..7ac181b7a9 100644 --- a/gtk/gtkcssenumvalueprivate.h +++ b/gtk/gtkcssenumvalueprivate.h @@ -21,7 +21,9 @@ #define __GTK_CSS_ENUM_VALUE_PRIVATE_H__ #include "gtkenums.h" -#include "gtkcssparserprivate.h" +#include +#include "gtk/css/gtkcsstokenizerprivate.h" +#include "gtk/css/gtkcssparserprivate.h" #include "gtkcsstypesprivate.h" #include "gtkcssvalueprivate.h" diff --git a/gtk/gtkcssfiltervalueprivate.h b/gtk/gtkcssfiltervalueprivate.h index b9eabaa237..6d76f906b7 100644 --- a/gtk/gtkcssfiltervalueprivate.h +++ b/gtk/gtkcssfiltervalueprivate.h @@ -20,7 +20,9 @@ #ifndef __GTK_CSS_FILTER_VALUE_PRIVATE_H__ #define __GTK_CSS_FILTER_VALUE_PRIVATE_H__ -#include "gtkcssparserprivate.h" +#include +#include "gtk/css/gtkcsstokenizerprivate.h" +#include "gtk/css/gtkcssparserprivate.h" #include "gtkcssvalueprivate.h" G_BEGIN_DECLS diff --git a/gtk/gtkcssfontfeaturesvalue.c b/gtk/gtkcssfontfeaturesvalue.c index c5f79eff89..faedc8cf44 100644 --- a/gtk/gtkcssfontfeaturesvalue.c +++ b/gtk/gtkcssfontfeaturesvalue.c @@ -20,7 +20,9 @@ #include "config.h" #include "gtkcsstypesprivate.h" -#include "gtkcssparserprivate.h" +#include +#include "gtk/css/gtkcsstokenizerprivate.h" +#include "gtk/css/gtkcssparserprivate.h" #include "gtkcssnumbervalueprivate.h" #include "gtkcssfontfeaturesvalueprivate.h" diff --git a/gtk/gtkcssfontfeaturesvalueprivate.h b/gtk/gtkcssfontfeaturesvalueprivate.h index f78a8cd182..b0001da986 100644 --- a/gtk/gtkcssfontfeaturesvalueprivate.h +++ b/gtk/gtkcssfontfeaturesvalueprivate.h @@ -20,7 +20,9 @@ #ifndef __GTK_CSS_FONT_FEATURES_VALUE_PRIVATE_H__ #define __GTK_CSS_FONT_FEATURES_VALUE_PRIVATE_H__ -#include "gtkcssparserprivate.h" +#include +#include "gtk/css/gtkcsstokenizerprivate.h" +#include "gtk/css/gtkcssparserprivate.h" #include "gtkcssvalueprivate.h" G_BEGIN_DECLS diff --git a/gtk/gtkcssfontvariationsvalue.c b/gtk/gtkcssfontvariationsvalue.c index 174cacf417..2ecae30ab0 100644 --- a/gtk/gtkcssfontvariationsvalue.c +++ b/gtk/gtkcssfontvariationsvalue.c @@ -19,7 +19,9 @@ #include "config.h" -#include "gtkcssparserprivate.h" +#include +#include "gtk/css/gtkcsstokenizerprivate.h" +#include "gtk/css/gtkcssparserprivate.h" #include "gtkcssnumbervalueprivate.h" #include "gtkcssfontvariationsvalueprivate.h" diff --git a/gtk/gtkcssfontvariationsvalueprivate.h b/gtk/gtkcssfontvariationsvalueprivate.h index 90e0fd3a84..c468848190 100644 --- a/gtk/gtkcssfontvariationsvalueprivate.h +++ b/gtk/gtkcssfontvariationsvalueprivate.h @@ -20,7 +20,9 @@ #ifndef __GTK_CSS_FONT_VARIATIONS_VALUE_PRIVATE_H__ #define __GTK_CSS_FONT_VARIATIONS_VALUE_PRIVATE_H__ -#include "gtkcssparserprivate.h" +#include +#include "gtk/css/gtkcsstokenizerprivate.h" +#include "gtk/css/gtkcssparserprivate.h" #include "gtkcssvalueprivate.h" G_BEGIN_DECLS diff --git a/gtk/gtkcssimageicontheme.c b/gtk/gtkcssimageicontheme.c index 2fa93d2540..debde7ee00 100644 --- a/gtk/gtkcssimageicontheme.c +++ b/gtk/gtkcssimageicontheme.c @@ -23,6 +23,7 @@ #include +#include "gtk/css/gtkcssserializerprivate.h" #include "gtksettingsprivate.h" #include "gtksnapshot.h" #include "gtkstyleproviderprivate.h" diff --git a/gtk/gtkcssimageprivate.h b/gtk/gtkcssimageprivate.h index d4e4e669ea..707c5d7648 100644 --- a/gtk/gtkcssimageprivate.h +++ b/gtk/gtkcssimageprivate.h @@ -23,7 +23,9 @@ #include #include -#include "gtk/gtkcssparserprivate.h" +#include +#include "gtk/css/gtkcsstokenizerprivate.h" +#include "gtk/css/gtkcssparserprivate.h" #include "gtk/gtkcsstypesprivate.h" #include "gtk/gtksnapshot.h" #include "gtk/gtkstyleprovider.h" diff --git a/gtk/gtkcsskeyframesprivate.h b/gtk/gtkcsskeyframesprivate.h index 89de02536c..359184840a 100644 --- a/gtk/gtkcsskeyframesprivate.h +++ b/gtk/gtkcsskeyframesprivate.h @@ -20,7 +20,9 @@ #ifndef __GTK_CSS_KEYFRAMES_PRIVATE_H__ #define __GTK_CSS_KEYFRAMES_PRIVATE_H__ -#include "gtkcssparserprivate.h" +#include +#include "gtk/css/gtkcsstokenizerprivate.h" +#include "gtk/css/gtkcssparserprivate.h" #include "gtkcssvalueprivate.h" #include "gtktypes.h" diff --git a/gtk/gtkcssnumbervalueprivate.h b/gtk/gtkcssnumbervalueprivate.h index bcac90e45e..5ea9b8f63b 100644 --- a/gtk/gtkcssnumbervalueprivate.h +++ b/gtk/gtkcssnumbervalueprivate.h @@ -20,7 +20,9 @@ #ifndef __GTK_CSS_NUMBER_VALUE_PRIVATE_H__ #define __GTK_CSS_NUMBER_VALUE_PRIVATE_H__ -#include "gtkcssparserprivate.h" +#include +#include "gtk/css/gtkcsstokenizerprivate.h" +#include "gtk/css/gtkcssparserprivate.h" #include "gtkcsstypesprivate.h" #include "gtkcssvalueprivate.h" diff --git a/gtk/gtkcsspalettevalueprivate.h b/gtk/gtkcsspalettevalueprivate.h index b422494a8a..baf25b90e7 100644 --- a/gtk/gtkcsspalettevalueprivate.h +++ b/gtk/gtkcsspalettevalueprivate.h @@ -20,7 +20,9 @@ #ifndef __GTK_CSS_PALETTE_VALUE_PRIVATE_H__ #define __GTK_CSS_PALETTE_VALUE_PRIVATE_H__ -#include "gtkcssparserprivate.h" +#include +#include "gtk/css/gtkcsstokenizerprivate.h" +#include "gtk/css/gtkcssparserprivate.h" #include "gtkcssvalueprivate.h" G_BEGIN_DECLS diff --git a/gtk/gtkcsspositionvalueprivate.h b/gtk/gtkcsspositionvalueprivate.h index fc87fbcbce..2ef70df8d7 100644 --- a/gtk/gtkcsspositionvalueprivate.h +++ b/gtk/gtkcsspositionvalueprivate.h @@ -20,7 +20,9 @@ #ifndef __GTK_CSS_POSITION_VALUE_PRIVATE_H__ #define __GTK_CSS_POSITION_VALUE_PRIVATE_H__ -#include "gtkcssparserprivate.h" +#include +#include "gtk/css/gtkcsstokenizerprivate.h" +#include "gtk/css/gtkcssparserprivate.h" #include "gtkcssvalueprivate.h" G_BEGIN_DECLS diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c index db84e1daef..ebbc1a165a 100644 --- a/gtk/gtkcssprovider.c +++ b/gtk/gtkcssprovider.c @@ -19,11 +19,13 @@ #include "gtkcssproviderprivate.h" +#include +#include "gtk/css/gtkcsstokenizerprivate.h" +#include "gtk/css/gtkcssparserprivate.h" #include "gtkbitmaskprivate.h" #include "gtkcssarrayvalueprivate.h" #include "gtkcsscolorvalueprivate.h" #include "gtkcsskeyframesprivate.h" -#include "gtkcssparserprivate.h" #include "gtkcssselectorprivate.h" #include "gtkcssshorthandpropertyprivate.h" #include "gtksettingsprivate.h" diff --git a/gtk/gtkcssrepeatvalueprivate.h b/gtk/gtkcssrepeatvalueprivate.h index 7e8baa315f..02665c5792 100644 --- a/gtk/gtkcssrepeatvalueprivate.h +++ b/gtk/gtkcssrepeatvalueprivate.h @@ -20,7 +20,9 @@ #ifndef __GTK_CSS_REPEAT_VALUE_PRIVATE_H__ #define __GTK_CSS_REPEAT_VALUE_PRIVATE_H__ -#include "gtkcssparserprivate.h" +#include +#include "gtk/css/gtkcsstokenizerprivate.h" +#include "gtk/css/gtkcssparserprivate.h" #include "gtkcssvalueprivate.h" G_BEGIN_DECLS diff --git a/gtk/gtkcssselectorprivate.h b/gtk/gtkcssselectorprivate.h index 9cff8e90a8..af6781867f 100644 --- a/gtk/gtkcssselectorprivate.h +++ b/gtk/gtkcssselectorprivate.h @@ -18,9 +18,11 @@ #ifndef __GTK_CSS_SELECTOR_PRIVATE_H__ #define __GTK_CSS_SELECTOR_PRIVATE_H__ +#include +#include "gtk/css/gtkcsstokenizerprivate.h" +#include "gtk/css/gtkcssparserprivate.h" #include "gtk/gtkcountingbloomfilterprivate.h" #include "gtk/gtkcsstypesprivate.h" -#include "gtk/gtkcssparserprivate.h" #define GDK_ARRAY_ELEMENT_TYPE gpointer #define GDK_ARRAY_TYPE_NAME GtkCssSelectorMatches diff --git a/gtk/gtkcssshadowvalueprivate.h b/gtk/gtkcssshadowvalueprivate.h index c14d686566..5784dfa516 100644 --- a/gtk/gtkcssshadowvalueprivate.h +++ b/gtk/gtkcssshadowvalueprivate.h @@ -23,9 +23,11 @@ #include #include +#include +#include "gtk/css/gtkcsstokenizerprivate.h" +#include "gtk/css/gtkcssparserprivate.h" #include "gtkborder.h" #include "gtktypes.h" -#include "gtkcssparserprivate.h" #include "gtkcssvalueprivate.h" #include "gtkroundedboxprivate.h" #include "gtksnapshot.h" diff --git a/gtk/gtkcssshorthandpropertyprivate.h b/gtk/gtkcssshorthandpropertyprivate.h index 52b8a470a9..4af065b265 100644 --- a/gtk/gtkcssshorthandpropertyprivate.h +++ b/gtk/gtkcssshorthandpropertyprivate.h @@ -22,7 +22,9 @@ #include -#include "gtk/gtkcssparserprivate.h" +#include +#include "gtk/css/gtkcsstokenizerprivate.h" +#include "gtk/css/gtkcssparserprivate.h" #include "gtk/gtkcssstylepropertyprivate.h" #include "gtk/gtkstylepropertyprivate.h" diff --git a/gtk/gtkcssstringvalue.c b/gtk/gtkcssstringvalue.c index c211c33afa..269a86e717 100644 --- a/gtk/gtkcssstringvalue.c +++ b/gtk/gtkcssstringvalue.c @@ -18,6 +18,7 @@ #include "config.h" #include "gtkcssstringvalueprivate.h" +#include "gtk/css/gtkcssserializerprivate.h" #include diff --git a/gtk/gtkcssstringvalueprivate.h b/gtk/gtkcssstringvalueprivate.h index 5fb703b6e3..8645077cd0 100644 --- a/gtk/gtkcssstringvalueprivate.h +++ b/gtk/gtkcssstringvalueprivate.h @@ -20,7 +20,9 @@ #ifndef __GTK_CSS_STRING_VALUE_PRIVATE_H__ #define __GTK_CSS_STRING_VALUE_PRIVATE_H__ -#include "gtkcssparserprivate.h" +#include +#include "gtk/css/gtkcsstokenizerprivate.h" +#include "gtk/css/gtkcssparserprivate.h" #include "gtkcsstypesprivate.h" #include "gtkcssvalueprivate.h" diff --git a/gtk/gtkcssstylepropertyimpl.c b/gtk/gtkcssstylepropertyimpl.c index eabafee6df..de7f2e3762 100644 --- a/gtk/gtkcssstylepropertyimpl.c +++ b/gtk/gtkcssstylepropertyimpl.c @@ -23,7 +23,9 @@ #include #include -#include "gtkcssparserprivate.h" +#include +#include "gtk/css/gtkcsstokenizerprivate.h" +#include "gtk/css/gtkcssparserprivate.h" #include "gtkcssstylepropertyprivate.h" #include "gtkcsstypesprivate.h" #include "gtkintl.h" diff --git a/gtk/gtkcsstransformvalueprivate.h b/gtk/gtkcsstransformvalueprivate.h index 143dd87868..d6b8191d4b 100644 --- a/gtk/gtkcsstransformvalueprivate.h +++ b/gtk/gtkcsstransformvalueprivate.h @@ -20,7 +20,9 @@ #ifndef __GTK_CSS_TRANSFORM_VALUE_PRIVATE_H__ #define __GTK_CSS_TRANSFORM_VALUE_PRIVATE_H__ -#include "gtkcssparserprivate.h" +#include +#include "gtk/css/gtkcsstokenizerprivate.h" +#include "gtk/css/gtkcssparserprivate.h" #include "gtkcssvalueprivate.h" G_BEGIN_DECLS diff --git a/gtk/gtkstyleproperty.c b/gtk/gtkstyleproperty.c index d0c82ec72c..e6fee266f0 100644 --- a/gtk/gtkstyleproperty.c +++ b/gtk/gtkstyleproperty.c @@ -20,7 +20,9 @@ #include "gtkstylepropertyprivate.h" #include "gtkcssprovider.h" -#include "gtkcssparserprivate.h" +#include +#include "gtk/css/gtkcsstokenizerprivate.h" +#include "gtk/css/gtkcssparserprivate.h" #include "gtkcssshorthandpropertyprivate.h" #include "gtkcssstylepropertyprivate.h" #include "gtkcsstypesprivate.h" diff --git a/gtk/gtkstylepropertyprivate.h b/gtk/gtkstylepropertyprivate.h index 385913f83e..b57331dd84 100644 --- a/gtk/gtkstylepropertyprivate.h +++ b/gtk/gtkstylepropertyprivate.h @@ -18,7 +18,9 @@ #ifndef __GTK_STYLEPROPERTY_PRIVATE_H__ #define __GTK_STYLEPROPERTY_PRIVATE_H__ -#include "gtkcssparserprivate.h" +#include +#include "gtk/css/gtkcsstokenizerprivate.h" +#include "gtk/css/gtkcssparserprivate.h" #include "gtkstylecontextprivate.h" #include "gtkcssvalueprivate.h" diff --git a/gtk/meson.build b/gtk/meson.build index 3e18f05cb6..8edef68f8b 100644 --- a/gtk/meson.build +++ b/gtk/meson.build @@ -82,7 +82,6 @@ gtk_private_sources = files([ 'gtkcssnodestylecache.c', 'gtkcssnumbervalue.c', 'gtkcsspalettevalue.c', - 'gtkcssparser.c', 'gtkcsspositionvalue.c', 'gtkcssrepeatvalue.c', 'gtkcssselector.c', -- 2.30.2